From b12e3b5cf224ad4e8b376ab07b28ee434de0c284 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Mon, 24 Oct 2016 10:21:49 +0200 Subject: [PATCH] gdk: Remove deprecated gdk_get_display --- docs/reference/gdk/gdk4-sections.txt | 3 --- gdk/gdk.c | 18 ------------------ gdk/gdkmain.h | 3 --- 3 files changed, 24 deletions(-) diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt index 6a480fc082..59808a0f0b 100644 --- a/docs/reference/gdk/gdk4-sections.txt +++ b/docs/reference/gdk/gdk4-sections.txt @@ -16,9 +16,6 @@ gdk_set_allowed_backends gdk_get_program_class gdk_set_program_class - -gdk_get_display - gdk_flush diff --git a/gdk/gdk.c b/gdk/gdk.c index 22d7841815..e7e1b3c3bf 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -401,24 +401,6 @@ gdk_parse_args (int *argc, GDK_NOTE (MISC, g_message ("progname: \"%s\"", g_get_prgname ())); } -/** - * gdk_get_display: - * - * Gets the name of the display, which usually comes from the - * `DISPLAY` environment variable or the - * `--display` command line option. - * - * Returns: the name of the display. - * - * Deprecated: 3.8: Call gdk_display_get_name (gdk_display_get_default ())) - * instead. - */ -gchar * -gdk_get_display (void) -{ - return g_strdup (gdk_display_get_name (gdk_display_get_default ())); -} - /** * gdk_get_display_arg_name: * diff --git a/gdk/gdkmain.h b/gdk/gdkmain.h index 74e9951f74..e39dc4aed0 100644 --- a/gdk/gdkmain.h +++ b/gdk/gdkmain.h @@ -78,9 +78,6 @@ void gdk_error_trap_pop_ignored (void); GDK_AVAILABLE_IN_ALL const gchar * gdk_get_display_arg_name (void); -GDK_DEPRECATED_IN_3_8_FOR(gdk_display_get_name (gdk_display_get_default ())) -gchar* gdk_get_display (void); - GDK_AVAILABLE_IN_ALL void gdk_set_double_click_time (guint msec); -- 2.30.2